From 8ebef872f34b15bad657d31e9d667844a8c56019 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann?= Date: Sat, 23 Oct 2004 19:18:51 +0000 Subject: [PATCH] Remove check for previous state being ACTIVE. Bug 153876. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sat Oct 23 15:17:55 2004 Søren Sandmann * gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check for previous state being ACTIVE. Bug 153876. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmenutoolbutton.c | 17 ++++++++--------- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f42f5683b6..6a5a3a0e0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Oct 23 15:17:55 2004 Søren Sandmann + + * gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check + for previous state being ACTIVE. Bug 153876. + 2004-10-22 Matthias Clasen * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f42f5683b6..6a5a3a0e0d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Oct 23 15:17:55 2004 Søren Sandmann + + * gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check + for previous state being ACTIVE. Bug 153876. + 2004-10-22 Matthias Clasen * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f42f5683b6..6a5a3a0e0d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Oct 23 15:17:55 2004 Søren Sandmann + + * gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check + for previous state being ACTIVE. Bug 153876. + 2004-10-22 Matthias Clasen * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f42f5683b6..6a5a3a0e0d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Oct 23 15:17:55 2004 Søren Sandmann + + * gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check + for previous state being ACTIVE. Bug 153876. + 2004-10-22 Matthias Clasen * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received) diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index fab52ff643..678a79dcf9 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -258,32 +258,31 @@ button_state_changed_cb (GtkWidget *widget, GtkMenuToolButton *button) { GtkMenuToolButtonPrivate *priv; - GtkWidget *b; + GtkWidget *other; GtkStateType state = GTK_WIDGET_STATE (widget); priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button); - b = (widget == priv->arrow_button) ? priv->button : priv->arrow_button; + other = (widget == priv->arrow_button) ? priv->button : priv->arrow_button; - g_signal_handlers_block_by_func (G_OBJECT (b), + g_signal_handlers_block_by_func (G_OBJECT (other), G_CALLBACK (button_state_changed_cb), button); - if (state == GTK_STATE_PRELIGHT && - previous_state != GTK_STATE_ACTIVE) + if (state == GTK_STATE_PRELIGHT) { - gtk_widget_set_state (b, state); + gtk_widget_set_state (other, state); } else if (state == GTK_STATE_NORMAL) { - gtk_widget_set_state (b, state); + gtk_widget_set_state (other, state); } else if (state == GTK_STATE_ACTIVE) { - gtk_widget_set_state (b, GTK_STATE_NORMAL); + gtk_widget_set_state (other, GTK_STATE_NORMAL); } - g_signal_handlers_unblock_by_func (G_OBJECT (b), + g_signal_handlers_unblock_by_func (G_OBJECT (other), G_CALLBACK (button_state_changed_cb), button); } -- 2.30.2